Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 10 Nov 2005 11:00:39 +0000 (12:00 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 10 Nov 2005 11:00:39 +0000 (12:00 +0100)

Trivial merge